Merge "WLFilters: Respect default values"

diff --git a/includes/revisiondelete/RevDelLogList.php b/includes/revisiondelete/RevDelLogList.php
index ceb97e4..728deb8 100644 (file)
--- a/includes/revisiondelete/RevDelLogList.php
+++ b/includes/revisiondelete/RevDelLogList.php
@@ -63,7 +63,7 @@ class RevDelLogList extends RevDelList {
        public function doQuery( $db ) {
                $ids = array_map( 'intval', $this->ids );
 
-               $commentQuery = CommentStore::getKey( 'log_comment' )->getJoin();
+               $commentQuery = CommentStore::newKey( 'log_comment' )->getJoin();
 
                return $db->select(
                        [ 'logging' ] + $commentQuery['tables'],

diff --git a/resources/Resources.php b/resources/Resources.php
index 3a5de66..f0aa9ec 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1506,6 +1506,9 @@ return [
        'mediawiki.action.view.postEdit' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.less',
+               'skinStyles' => [
+                       'monobook' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.monobook.css',
+               ],
                'dependencies' => [
                        'mediawiki.jqueryMsg',
                        'mediawiki.notification'

diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less
index 467928d..e1fa925 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less
+++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less
@@ -24,11 +24,6 @@
        }
 }
 
-// TODO: Move to monobook skin
-.skin-monobook .postedit {
-       top: 6em !important; /* stylelint-disable-line declaration-no-important */
-}
-
 .postedit-faded {
        opacity: 0;
 }

diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.monobook.css b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.monobook.css
new file mode 100644 (file)
index 0000000..50f0c8a
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.monobook.css
@@ -0,0 +1,3 @@
+.postedit {
+       top: 6em;
+}